From 11245bc5497c8d27aa97ee4aecfb3f99397eee24 Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Wed, 23 Jul 2014 13:26:36 +0200 Subject: [PATCH] Adwaita: GtkCalendar style simplification --- gtk/resources/theme/Adwaita/_common.scss | 38 ++++---- .../theme/Adwaita/gtk-contained-dark.css | 97 +++++++++++-------- gtk/resources/theme/Adwaita/gtk-contained.css | 97 +++++++++++-------- 3 files changed, 129 insertions(+), 103 deletions(-) diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss index 284a57b1eb..63739133cf 100644 --- a/gtk/resources/theme/Adwaita/_common.scss +++ b/gtk/resources/theme/Adwaita/_common.scss @@ -2161,30 +2161,34 @@ GtkExpander { ***********/ GtkCalendar { border: 1px solid $borders_color; + &:selected { + background-color: $selected_bg_color; + color: $selected_fg_color; + border-radius: 3px; + &:backdrop { + color: if($variant=='light', $backdrop_base_color, $backdrop_fg_color); + } + } + &.header { + @extend .titlebar; + box-shadow: inset 0 -1px mix($borders_color, $bg_color, 30%), + inset 0px 1px $top_hilight, + 0 1px 2px transparentize(black,0.9); + border: 1px solid $borders_color; + border-radius: 0; + &:backdrop { box-shadow: none; } + } &.button { @extend %undecorated_button; - padding: 0 4px; //FIXME no effect on these pseudobuttons - color: mix($fg_color, $base_color, 40%); //we need a dimmed stuff var + color: transparentize($fg-color,0.55); &:hover { @extend %undecorated_button; color: $fg_color; } - &:backdrop, &:backdrop:hover { - @extend %undecorated_button; - color: mix($backdrop_fg_color, $backdrop_base_color, 50%); - } - } - &.view { border-radius: 2px; } - &.header { - background: linear-gradient(to bottom, - lighten($bg_color,2%), - darken($bg_color,2%)); - border-bottom-color: mix($borders_color,$bg_color,50%); - &:backdrop { - background-image: linear-gradient(to bottom, $backdrop_bg_color); - border-bottom-color: mix($backdrop_borders_color,$backdrop_bg_color,50%); - } + &:backdrop { color: transparentize($backdrop_fg_color,0.55); } } + &.highlight { color: gtkalpha(currentColor,0.55); } + &:backdrop { border-color: $backdrop_borders_color; } } /*********** diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css index 43c36dc0ce..1f1895e233 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css @@ -116,7 +116,7 @@ .overshoot { background-color: rgba(33, 93, 156, 0.2); } -.dim-label, .titlebar .subtitle, +.dim-label, .titlebar .subtitle, GtkCalendar.header .subtitle, .header-bar .subtitle { opacity: 0.55; text-shadow: none; } @@ -631,7 +631,7 @@ border-radius: 3px; border-style: solid; } -.button.flat, .button.flat:backdrop, .button.flat:backdrop:insensitive, .menuitem.button.flat, .menuitem.button.flat:backdrop, .menuitem.button.flat:backdrop:hover, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:visited:hover, .button:visited:active, .button:link:backdrop, .button:visited:backdrop, .notebook tab .button, .list-row.button, .list-row.button:backdrop:hover, GtkCalendar.button, GtkCalendar.button:hover, GtkCalendar.button:backdrop, GtkCalendar.button:backdrop:hover, .scale-popup .button:hover, .scale-popup .button:backdrop, .scale-popup .button:backdrop:hover, .scale-popup .button:backdrop:insensitive { +.button.flat, .button.flat:backdrop, .button.flat:backdrop:insensitive, .menuitem.button.flat, .menuitem.button.flat:backdrop, .menuitem.button.flat:backdrop:hover, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:visited:hover, .button:visited:active, .button:link:backdrop, .button:visited:backdrop, .notebook tab .button, .list-row.button, .list-row.button:backdrop:hover, GtkCalendar.button, GtkCalendar.button:hover, .scale-popup .button:hover, .scale-popup .button:backdrop, .scale-popup .button:backdrop:hover, .scale-popup .button:backdrop:insensitive { border-color: transparent; background-color: transparent; background-image: none; @@ -888,7 +888,7 @@ GtkComboBox { /*************** * Header bars * ***************/ -.titlebar, +.titlebar, GtkCalendar.header, .header-bar { border-width: 0 0 1px; border-style: solid; @@ -898,43 +898,43 @@ GtkComboBox { background-image: linear-gradient(to bottom, #434a4a, #393f3f); box-shadow: inset 0 -1px #303535, inset 0 1px rgba(238, 238, 236, 0.1); padding: 6px; } - .titlebar:backdrop, + .titlebar:backdrop, GtkCalendar.header:backdrop, .header-bar:backdrop { border-color: #1e2222; background-color: #393f3f; background-image: none; box-shadow: inset 0 1px rgba(238, 238, 236, 0.1); } - .titlebar .title, + .titlebar .title, GtkCalendar.header .title, .header-bar .title { font: Bold; padding: 0px 12px; } - .titlebar .subtitle, + .titlebar .subtitle, GtkCalendar.header .subtitle, .header-bar .subtitle { font-size: 80%; padding: 0 12px; } - .titlebar .header-bar-separator, .titlebar > GtkBox > .separator.vertical, + .titlebar .header-bar-separator, GtkCalendar.header .header-bar-separator, .titlebar > GtkBox > .separator.vertical, GtkCalendar.header > GtkBox > .separator.vertical, .header-bar .header-bar-separator, .header-bar > GtkBox > .separator.vertical { -GtkWidget-wide-separators: true; -GtkWidget-separator-width: 1px; border-width: 0 1px; border-image: linear-gradient(to bottom, rgba(28, 31, 31, 0), #1c1f1f 30%, #1c1f1f 70%, rgba(28, 31, 31, 0) 100%) 0 1/0 1px stretch; } - .titlebar .header-bar-separator:backdrop, .titlebar > GtkBox > .separator.vertical:backdrop, + .titlebar .header-bar-separator:backdrop, GtkCalendar.header .header-bar-separator:backdrop, .titlebar > GtkBox > .separator.vertical:backdrop, GtkCalendar.header > GtkBox > .separator.vertical:backdrop, .header-bar .header-bar-separator:backdrop, .header-bar > GtkBox > .separator.vertical:backdrop { border-image: linear-gradient(to bottom, rgba(30, 34, 34, 0.5)) 0 1/1px 1px; } - .titlebar.selection-mode, + .titlebar.selection-mode, GtkCalendar.selection-mode.header, .header-bar.selection-mode { color: #14375d; text-shadow: 0 1px rgba(0, 0, 0, 0.5); border-color: #0f2b48; background-image: linear-gradient(to bottom, #256ab1, #215d9c); box-shadow: inset 0 -1px #1a4b7e, inset 0 1px rgba(48, 103, 161, 0.46); } - .titlebar.selection-mode:backdrop, + .titlebar.selection-mode:backdrop, GtkCalendar.selection-mode.header:backdrop, .header-bar.selection-mode:backdrop { background-image: linear-gradient(to bottom, #215d9c); box-shadow: inset 0 1px rgba(48, 103, 161, 0.46); } - .titlebar.selection-mode .button, + .titlebar.selection-mode .button, GtkCalendar.selection-mode.header .button, .header-bar.selection-mode .button { border-style: solid; border-width: 1px; @@ -944,7 +944,7 @@ GtkComboBox { text-shadow: 0 -1px rgba(0, 0, 0, 0.70353); icon-shadow: 0 -1px rgba(0, 0, 0, 0.70353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); } - .titlebar.selection-mode .button:hover, + .titlebar.selection-mode .button:hover, GtkCalendar.selection-mode.header .button:hover, .header-bar.selection-mode .button:hover { border-style: solid; color: white; @@ -953,7 +953,7 @@ GtkComboBox { text-shadow: 0 -1px rgba(0, 0, 0, 0.67153); icon-shadow: 0 -1px rgba(0, 0, 0, 0.67153); box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); } - .titlebar.selection-mode .button:active, + .titlebar.selection-mode .button:active, GtkCalendar.selection-mode.header .button:active, .header-bar.selection-mode .button:active { border-style: solid; color: white; @@ -962,7 +962,7 @@ GtkComboBox { text-shadow: 0 -1px rgba(0, 0, 0, 0.78353); icon-shadow: 0 -1px rgba(0, 0, 0, 0.78353); box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } - .titlebar.selection-mode .button:insensitive, + .titlebar.selection-mode .button:insensitive, GtkCalendar.selection-mode.header .button:insensitive, .header-bar.selection-mode .button:insensitive { border-style: solid; color: #939695; @@ -971,7 +971,7 @@ GtkComboBox { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - .titlebar.selection-mode .button:backdrop, + .titlebar.selection-mode .button:backdrop, GtkCalendar.selection-mode.header .button:backdrop, .header-bar.selection-mode .button:backdrop { border-style: solid; color: white; @@ -981,14 +981,14 @@ GtkComboBox { icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); border-color: #0f2b48; } - .titlebar.selection-mode .button:backdrop:insensitive, + .titlebar.selection-mode .button:backdrop:insensitive, GtkCalendar.selection-mode.header .button:backdrop:insensitive, .header-bar.selection-mode .button:backdrop:insensitive { border-style: solid; color: #454c4c; border-color: #1e2222; background-image: linear-gradient(to bottom, #323636); box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); } - .titlebar.selection-mode .button.suggested-action, + .titlebar.selection-mode .button.suggested-action, GtkCalendar.selection-mode.header .button.suggested-action, .header-bar.selection-mode .button.suggested-action { border-style: solid; border-width: 1px; @@ -999,7 +999,7 @@ GtkComboBox { icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176); box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); border-color: #0f2b48; } - .titlebar.selection-mode .button.suggested-action:hover, + .titlebar.selection-mode .button.suggested-action:hover, GtkCalendar.selection-mode.header .button.suggested-action:hover, .header-bar.selection-mode .button.suggested-action:hover { border-style: solid; color: #eeeeec; @@ -1009,7 +1009,7 @@ GtkComboBox { icon-shadow: 0 -1px rgba(0, 0, 0, 0.77976); box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); border-color: #0f2b48; } - .titlebar.selection-mode .button.suggested-action:active, + .titlebar.selection-mode .button.suggested-action:active, GtkCalendar.selection-mode.header .button.suggested-action:active, .header-bar.selection-mode .button.suggested-action:active { border-style: solid; color: #eeeeec; @@ -1019,7 +1019,7 @@ GtkComboBox { icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176); box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); border-color: #0f2b48; } - .titlebar.selection-mode .button.suggested-action:insensitive, + .titlebar.selection-mode .button.suggested-action:insensitive, GtkCalendar.selection-mode.header .button.suggested-action:insensitive, .header-bar.selection-mode .button.suggested-action:insensitive { border-style: solid; color: #939695; @@ -1029,7 +1029,7 @@ GtkComboBox { icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #0f2b48; } - .titlebar.selection-mode .button.suggested-action:backdrop, + .titlebar.selection-mode .button.suggested-action:backdrop, GtkCalendar.selection-mode.header .button.suggested-action:backdrop, .header-bar.selection-mode .button.suggested-action:backdrop { border-style: solid; color: #c9cbc9; @@ -1039,7 +1039,7 @@ GtkComboBox { icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); border-color: #0f2b48; } - .titlebar.selection-mode .button.suggested-action:backdrop:insensitive, + .titlebar.selection-mode .button.suggested-action:backdrop:insensitive, GtkCalendar.selection-mode.header .button.suggested-action:backdrop:insensitive, .header-bar.selection-mode .button.suggested-action:backdrop:insensitive { border-style: solid; color: #454c4c; @@ -1047,7 +1047,7 @@ GtkComboBox { background-image: linear-gradient(to bottom, #323636); box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); border-color: #0f2b48; } - .titlebar.selection-mode .selection-menu, .titlebar.selection-mode .selection-menu:backdrop, + .titlebar.selection-mode .selection-menu, GtkCalendar.selection-mode.header .selection-menu, .titlebar.selection-mode .selection-menu:backdrop, GtkCalendar.selection-mode.header .selection-menu:backdrop, .header-bar.selection-mode .selection-menu, .header-bar.selection-mode .selection-menu:backdrop { border-color: rgba(33, 93, 156, 0); @@ -1055,16 +1055,16 @@ GtkComboBox { box-shadow: none; padding-left: 10px; padding-right: 10px; } - .titlebar.selection-mode .selection-menu GtkArrow, .titlebar.selection-mode .selection-menu:backdrop GtkArrow, + .titlebar.selection-mode .selection-menu GtkArrow, GtkCalendar.selection-mode.header .selection-menu GtkArrow, .titlebar.selection-mode .selection-menu:backdrop GtkArrow, GtkCalendar.selection-mode.header .selection-menu:backdrop GtkArrow, .header-bar.selection-mode .selection-menu GtkArrow, .header-bar.selection-mode .selection-menu:backdrop GtkArrow { -GtkArrow-arrow-scaling: 1; } - .titlebar.selection-mode .selection-menu .arrow, + .titlebar.selection-mode .selection-menu .arrow, GtkCalendar.selection-mode.header .selection-menu .arrow, .header-bar.selection-mode .selection-menu .arrow { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); color: rgba(255, 255, 255, 0.5); icon-shadow: none; } - .tiled .titlebar, .maximized .titlebar, .tiled + .tiled .titlebar, .tiled GtkCalendar.header, .maximized .titlebar, .maximized GtkCalendar.header, .tiled .header-bar, .maximized .header-bar { border-radius: 0; } @@ -2597,21 +2597,28 @@ GtkExpander { ***********/ GtkCalendar { border: 1px solid #1c1f1f; } + GtkCalendar:selected { + background-color: #215d9c; + color: white; + border-radius: 3px; } + GtkCalendar:selected:backdrop { + color: #c9cbc9; } + GtkCalendar.header { + box-shadow: inset 0 -1px #303535, inset 0px 1px rgba(238, 238, 236, 0.1), 0 1px 2px rgba(0, 0, 0, 0.1); + border: 1px solid #1c1f1f; + border-radius: 0; } + GtkCalendar.header:backdrop { + box-shadow: none; } GtkCalendar.button { - padding: 0 4px; - color: #777777; } + color: rgba(238, 238, 236, 0.45); } GtkCalendar.button:hover { color: #eeeeec; } - GtkCalendar.button:backdrop, GtkCalendar.button:backdrop:hover { - color: #7a7b7a; } - GtkCalendar.view { - border-radius: 2px; } - GtkCalendar.header { - background: linear-gradient(to bottom, #3e4444, #343a3a); - border-bottom-color: #2a2f2f; } - GtkCalendar.header:backdrop { - background-image: linear-gradient(to bottom, #393f3f); - border-bottom-color: #2b3030; } + GtkCalendar.button:backdrop { + color: rgba(201, 203, 201, 0.45); } + GtkCalendar.highlight { + color: alpha(currentColor,0.55); } + GtkCalendar:backdrop { + border-color: #1e2222; } /*********** * Dialogs * @@ -2621,7 +2628,7 @@ GtkCalendar { .message-dialog { -GtkDialog-button-spacing: 0; } - .message-dialog .titlebar { + .message-dialog .titlebar, .message-dialog GtkCalendar.header { border-style: none; box-shadow: inset 0 1px rgba(238, 238, 236, 0.1); } .message-dialog.csd.background { @@ -3022,14 +3029,16 @@ GtkVolumeButton.button { box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(28, 31, 31, 0.8); } .header-bar .button.titlebutton, -.titlebar .button.titlebutton { +.titlebar .button.titlebutton, +GtkCalendar.header .button.titlebutton { padding: 8px; border-color: transparent; background-image: none; transition-property: border, box-shadow, color; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); } .header-bar .button.titlebutton:hover, - .titlebar .button.titlebutton:hover { + .titlebar .button.titlebutton:hover, + GtkCalendar.header .button.titlebutton:hover { border-style: solid; border-width: 1px; color: #eeeeec; @@ -3039,7 +3048,8 @@ GtkVolumeButton.button { icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176); box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1); } .header-bar .button.titlebutton:active, - .titlebar .button.titlebutton:active { + .titlebar .button.titlebutton:active, + GtkCalendar.header .button.titlebutton:active { border-style: solid; color: #eeeeec; border-color: #1c1f1f; @@ -3048,7 +3058,8 @@ GtkVolumeButton.button { icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176); box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(238, 238, 236, 0.1); } .header-bar .button.titlebutton:backdrop, - .titlebar .button.titlebutton:backdrop { + .titlebar .button.titlebutton:backdrop, + GtkCalendar.header .button.titlebutton:backdrop { border-style: solid; color: #c9cbc9; border-color: #1e2222; diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css index b2245d8763..4070b7d12c 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained.css +++ b/gtk/resources/theme/Adwaita/gtk-contained.css @@ -116,7 +116,7 @@ .overshoot { background-color: rgba(74, 144, 217, 0.2); } -.dim-label, .titlebar .subtitle, +.dim-label, .titlebar .subtitle, GtkCalendar.header .subtitle, .header-bar .subtitle { opacity: 0.55; text-shadow: none; } @@ -623,7 +623,7 @@ border-radius: 3px; border-style: solid; } -.button.flat, .button.flat:backdrop, .button.flat:backdrop:insensitive, .menuitem.button.flat, .menuitem.button.flat:backdrop, .menuitem.button.flat:backdrop:hover, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:visited:hover, .button:visited:active, .button:link:backdrop, .button:visited:backdrop, .notebook tab .button, .list-row.button, .list-row.button:backdrop:hover, GtkCalendar.button, GtkCalendar.button:hover, GtkCalendar.button:backdrop, GtkCalendar.button:backdrop:hover, .scale-popup .button:hover, .scale-popup .button:backdrop, .scale-popup .button:backdrop:hover, .scale-popup .button:backdrop:insensitive { +.button.flat, .button.flat:backdrop, .button.flat:backdrop:insensitive, .menuitem.button.flat, .menuitem.button.flat:backdrop, .menuitem.button.flat:backdrop:hover, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:visited:hover, .button:visited:active, .button:link:backdrop, .button:visited:backdrop, .notebook tab .button, .list-row.button, .list-row.button:backdrop:hover, GtkCalendar.button, GtkCalendar.button:hover, .scale-popup .button:hover, .scale-popup .button:backdrop, .scale-popup .button:backdrop:hover, .scale-popup .button:backdrop:insensitive { border-color: transparent; background-color: transparent; background-image: none; @@ -880,7 +880,7 @@ GtkComboBox { /*************** * Header bars * ***************/ -.titlebar, +.titlebar, GtkCalendar.header, .header-bar { border-width: 0 0 1px; border-style: solid; @@ -890,43 +890,43 @@ GtkComboBox { background-image: linear-gradient(to bottom, #f7f7f7, #ededed); box-shadow: inset 0 -1px #d6d6d6, inset 0 1px white; padding: 6px; } - .titlebar:backdrop, + .titlebar:backdrop, GtkCalendar.header:backdrop, .header-bar:backdrop { border-color: #a8a8a8; background-color: #ededed; background-image: none; box-shadow: inset 0 1px white; } - .titlebar .title, + .titlebar .title, GtkCalendar.header .title, .header-bar .title { font: Bold; padding: 0px 12px; } - .titlebar .subtitle, + .titlebar .subtitle, GtkCalendar.header .subtitle, .header-bar .subtitle { font-size: 80%; padding: 0 12px; } - .titlebar .header-bar-separator, .titlebar > GtkBox > .separator.vertical, + .titlebar .header-bar-separator, GtkCalendar.header .header-bar-separator, .titlebar > GtkBox > .separator.vertical, GtkCalendar.header > GtkBox > .separator.vertical, .header-bar .header-bar-separator, .header-bar > GtkBox > .separator.vertical { -GtkWidget-wide-separators: true; -GtkWidget-separator-width: 1px; border-width: 0 1px; border-image: linear-gradient(to bottom, rgba(161, 161, 161, 0), #a1a1a1 30%, #a1a1a1 70%, rgba(161, 161, 161, 0) 100%) 0 1/0 1px stretch; } - .titlebar .header-bar-separator:backdrop, .titlebar > GtkBox > .separator.vertical:backdrop, + .titlebar .header-bar-separator:backdrop, GtkCalendar.header .header-bar-separator:backdrop, .titlebar > GtkBox > .separator.vertical:backdrop, GtkCalendar.header > GtkBox > .separator.vertical:backdrop, .header-bar .header-bar-separator:backdrop, .header-bar > GtkBox > .separator.vertical:backdrop { border-image: linear-gradient(to bottom, rgba(168, 168, 168, 0.5)) 0 1/1px 1px; } - .titlebar.selection-mode, + .titlebar.selection-mode, GtkCalendar.selection-mode.header, .header-bar.selection-mode { color: #256ab1; text-shadow: 0 1px rgba(0, 0, 0, 0.5); border-color: #184472; background-image: linear-gradient(to bottom, #5f9ddd, #4a90d9); box-shadow: inset 0 -1px #3875b4, inset 0 1px #b6d2ef; } - .titlebar.selection-mode:backdrop, + .titlebar.selection-mode:backdrop, GtkCalendar.selection-mode.header:backdrop, .header-bar.selection-mode:backdrop { background-image: linear-gradient(to bottom, #4a90d9); box-shadow: inset 0 1px #b6d2ef; } - .titlebar.selection-mode .button, + .titlebar.selection-mode .button, GtkCalendar.selection-mode.header .button, .header-bar.selection-mode .button { border-style: solid; border-width: 1px; @@ -936,7 +936,7 @@ GtkComboBox { text-shadow: 0 -1px rgba(0, 0, 0, 0.54353); icon-shadow: 0 -1px rgba(0, 0, 0, 0.54353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); } - .titlebar.selection-mode .button:hover, + .titlebar.selection-mode .button:hover, GtkCalendar.selection-mode.header .button:hover, .header-bar.selection-mode .button:hover { border-style: solid; color: white; @@ -945,7 +945,7 @@ GtkComboBox { text-shadow: 0 -1px rgba(0, 0, 0, 0.51153); icon-shadow: 0 -1px rgba(0, 0, 0, 0.51153); box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); } - .titlebar.selection-mode .button:active, + .titlebar.selection-mode .button:active, GtkCalendar.selection-mode.header .button:active, .header-bar.selection-mode .button:active { border-style: solid; color: white; @@ -954,7 +954,7 @@ GtkComboBox { text-shadow: 0 -1px rgba(0, 0, 0, 0.62353); icon-shadow: 0 -1px rgba(0, 0, 0, 0.62353); box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } - .titlebar.selection-mode .button:insensitive, + .titlebar.selection-mode .button:insensitive, GtkCalendar.selection-mode.header .button:insensitive, .header-bar.selection-mode .button:insensitive { border-style: solid; color: #8d9091; @@ -963,7 +963,7 @@ GtkComboBox { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - .titlebar.selection-mode .button:backdrop, + .titlebar.selection-mode .button:backdrop, GtkCalendar.selection-mode.header .button:backdrop, .header-bar.selection-mode .button:backdrop { border-style: solid; color: white; @@ -973,14 +973,14 @@ GtkComboBox { icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); border-color: #184472; } - .titlebar.selection-mode .button:backdrop:insensitive, + .titlebar.selection-mode .button:backdrop:insensitive, GtkCalendar.selection-mode.header .button:backdrop:insensitive, .header-bar.selection-mode .button:backdrop:insensitive { border-style: solid; color: #c7c7c7; border-color: #a8a8a8; background-image: linear-gradient(to bottom, #f4f4f4); box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); } - .titlebar.selection-mode .button.suggested-action, + .titlebar.selection-mode .button.suggested-action, GtkCalendar.selection-mode.header .button.suggested-action, .header-bar.selection-mode .button.suggested-action { border-style: solid; border-width: 1px; @@ -991,7 +991,7 @@ GtkComboBox { icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); box-shadow: inset 0 1px white; border-color: #184472; } - .titlebar.selection-mode .button.suggested-action:hover, + .titlebar.selection-mode .button.suggested-action:hover, GtkCalendar.selection-mode.header .button.suggested-action:hover, .header-bar.selection-mode .button.suggested-action:hover { border-style: solid; color: #2e3436; @@ -1001,7 +1001,7 @@ GtkComboBox { icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); box-shadow: inset 0 1px white; border-color: #184472; } - .titlebar.selection-mode .button.suggested-action:active, + .titlebar.selection-mode .button.suggested-action:active, GtkCalendar.selection-mode.header .button.suggested-action:active, .header-bar.selection-mode .button.suggested-action:active { border-style: solid; color: #2e3436; @@ -1011,7 +1011,7 @@ GtkComboBox { icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); border-color: #184472; } - .titlebar.selection-mode .button.suggested-action:insensitive, + .titlebar.selection-mode .button.suggested-action:insensitive, GtkCalendar.selection-mode.header .button.suggested-action:insensitive, .header-bar.selection-mode .button.suggested-action:insensitive { border-style: solid; color: #8d9091; @@ -1021,7 +1021,7 @@ GtkComboBox { icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #184472; } - .titlebar.selection-mode .button.suggested-action:backdrop, + .titlebar.selection-mode .button.suggested-action:backdrop, GtkCalendar.selection-mode.header .button.suggested-action:backdrop, .header-bar.selection-mode .button.suggested-action:backdrop { border-style: solid; color: #54595a; @@ -1031,7 +1031,7 @@ GtkComboBox { icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); border-color: #184472; } - .titlebar.selection-mode .button.suggested-action:backdrop:insensitive, + .titlebar.selection-mode .button.suggested-action:backdrop:insensitive, GtkCalendar.selection-mode.header .button.suggested-action:backdrop:insensitive, .header-bar.selection-mode .button.suggested-action:backdrop:insensitive { border-style: solid; color: #c7c7c7; @@ -1039,7 +1039,7 @@ GtkComboBox { background-image: linear-gradient(to bottom, #f4f4f4); box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); border-color: #184472; } - .titlebar.selection-mode .selection-menu, .titlebar.selection-mode .selection-menu:backdrop, + .titlebar.selection-mode .selection-menu, GtkCalendar.selection-mode.header .selection-menu, .titlebar.selection-mode .selection-menu:backdrop, GtkCalendar.selection-mode.header .selection-menu:backdrop, .header-bar.selection-mode .selection-menu, .header-bar.selection-mode .selection-menu:backdrop { border-color: rgba(74, 144, 217, 0); @@ -1047,16 +1047,16 @@ GtkComboBox { box-shadow: none; padding-left: 10px; padding-right: 10px; } - .titlebar.selection-mode .selection-menu GtkArrow, .titlebar.selection-mode .selection-menu:backdrop GtkArrow, + .titlebar.selection-mode .selection-menu GtkArrow, GtkCalendar.selection-mode.header .selection-menu GtkArrow, .titlebar.selection-mode .selection-menu:backdrop GtkArrow, GtkCalendar.selection-mode.header .selection-menu:backdrop GtkArrow, .header-bar.selection-mode .selection-menu GtkArrow, .header-bar.selection-mode .selection-menu:backdrop GtkArrow { -GtkArrow-arrow-scaling: 1; } - .titlebar.selection-mode .selection-menu .arrow, + .titlebar.selection-mode .selection-menu .arrow, GtkCalendar.selection-mode.header .selection-menu .arrow, .header-bar.selection-mode .selection-menu .arrow { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); color: rgba(255, 255, 255, 0.5); icon-shadow: none; } - .tiled .titlebar, .maximized .titlebar, .tiled + .tiled .titlebar, .tiled GtkCalendar.header, .maximized .titlebar, .maximized GtkCalendar.header, .tiled .header-bar, .maximized .header-bar { border-radius: 0; } @@ -2592,21 +2592,28 @@ GtkExpander { ***********/ GtkCalendar { border: 1px solid #a1a1a1; } + GtkCalendar:selected { + background-color: #4a90d9; + color: white; + border-radius: 3px; } + GtkCalendar:selected:backdrop { + color: #fcfcfc; } + GtkCalendar.header { + box-shadow: inset 0 -1px #d6d6d6, inset 0px 1px white, 0 1px 2px rgba(0, 0, 0, 0.1); + border: 1px solid #a1a1a1; + border-radius: 0; } + GtkCalendar.header:backdrop { + box-shadow: none; } GtkCalendar.button { - padding: 0 4px; - color: #abadae; } + color: rgba(46, 52, 54, 0.45); } GtkCalendar.button:hover { color: #2e3436; } - GtkCalendar.button:backdrop, GtkCalendar.button:backdrop:hover { - color: #a8aaab; } - GtkCalendar.view { - border-radius: 2px; } - GtkCalendar.header { - background: linear-gradient(to bottom, #f2f2f2, #e8e8e8); - border-bottom-color: #c7c7c7; } - GtkCalendar.header:backdrop { - background-image: linear-gradient(to bottom, #ededed); - border-bottom-color: #cacaca; } + GtkCalendar.button:backdrop { + color: rgba(84, 89, 90, 0.45); } + GtkCalendar.highlight { + color: alpha(currentColor,0.55); } + GtkCalendar:backdrop { + border-color: #a8a8a8; } /*********** * Dialogs * @@ -2616,7 +2623,7 @@ GtkCalendar { .message-dialog { -GtkDialog-button-spacing: 0; } - .message-dialog .titlebar { + .message-dialog .titlebar, .message-dialog GtkCalendar.header { border-style: none; box-shadow: inset 0 1px white; } .message-dialog.csd.background { @@ -3017,14 +3024,16 @@ GtkVolumeButton.button { box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13); } .header-bar .button.titlebutton, -.titlebar .button.titlebutton { +.titlebar .button.titlebutton, +GtkCalendar.header .button.titlebutton { padding: 8px; border-color: transparent; background-image: none; transition-property: border, box-shadow, color; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); } .header-bar .button.titlebutton:hover, - .titlebar .button.titlebutton:hover { + .titlebar .button.titlebutton:hover, + GtkCalendar.header .button.titlebutton:hover { border-style: solid; border-width: 1px; color: #2e3436; @@ -3034,7 +3043,8 @@ GtkVolumeButton.button { icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); box-shadow: inset 0 1px white, 0 1px white; } .header-bar .button.titlebutton:active, - .titlebar .button.titlebutton:active { + .titlebar .button.titlebutton:active, + GtkCalendar.header .button.titlebutton:active { border-style: solid; color: #2e3436; border-color: #a1a1a1; @@ -3043,7 +3053,8 @@ GtkVolumeButton.button { icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px white; } .header-bar .button.titlebutton:backdrop, - .titlebar .button.titlebutton:backdrop { + .titlebar .button.titlebutton:backdrop, + GtkCalendar.header .button.titlebutton:backdrop { border-style: solid; color: #54595a; border-color: #a8a8a8; -- 2.30.2